fix so that default icons are created if you call gtk_stock_list_ids()

2001-05-25  Havoc Pennington  <hp@redhat.com>

	* gtk/gtkiconfactory.c: fix so that default icons are created if
	you call gtk_stock_list_ids()

	* demos/gtk-demo/stock_browser.c (create_model): sort stock items
	in list

diff --git a/ChangeLog b/ChangeLog
index f96569ce4f7f3006ca077231c78ab1c5dc8ca3f1..0adb6a34fe4bc0644871d95e00a7c41ca9b130e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2001-05-25  Havoc Pennington  <hp@redhat.com>
-       
+
+       * gtk/gtkiconfactory.c: fix so that default icons are created if 
+       you call gtk_stock_list_ids()
+
+       * demos/gtk-demo/stock_browser.c (create_model): sort stock items
+       in list
+
+2001-05-25  Havoc Pennington  <hp@redhat.com>
+
        * gtk/gtkiconfactory.c (gtk_icon_set_get_sizes): get sizes an icon
        set can render without falling back to missing image icon
 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f96569ce4f7f3006ca077231c78ab1c5dc8ca3f1..0adb6a34fe4bc0644871d95e00a7c41ca9b130e7 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,5 +1,13 @@
 2001-05-25  Havoc Pennington  <hp@redhat.com>
-       
+
+       * gtk/gtkiconfactory.c: fix so that default icons are created if 
+       you call gtk_stock_list_ids()
+
+       * demos/gtk-demo/stock_browser.c (create_model): sort stock items
+       in list
+
+2001-05-25  Havoc Pennington  <hp@redhat.com>
+
        * gtk/gtkiconfactory.c (gtk_icon_set_get_sizes): get sizes an icon
        set can render without falling back to missing image icon
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f96569ce4f7f3006ca077231c78ab1c5dc8ca3f1..0adb6a34fe4bc0644871d95e00a7c41ca9b130e7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,13 @@
 2001-05-25  Havoc Pennington  <hp@redhat.com>
-       
+
+       * gtk/gtkiconfactory.c: fix so that default icons are created if 
+       you call gtk_stock_list_ids()
+
+       * demos/gtk-demo/stock_browser.c (create_model): sort stock items
+       in list
+
+2001-05-25  Havoc Pennington  <hp@redhat.com>
+
        * gtk/gtkiconfactory.c (gtk_icon_set_get_sizes): get sizes an icon
        set can render without falling back to missing image icon
 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f96569ce4f7f3006ca077231c78ab1c5dc8ca3f1..0adb6a34fe4bc0644871d95e00a7c41ca9b130e7 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,5 +1,13 @@
 2001-05-25  Havoc Pennington  <hp@redhat.com>
-       
+
+       * gtk/gtkiconfactory.c: fix so that default icons are created if 
+       you call gtk_stock_list_ids()
+
+       * demos/gtk-demo/stock_browser.c (create_model): sort stock items
+       in list
+
+2001-05-25  Havoc Pennington  <hp@redhat.com>
+
        * gtk/gtkiconfactory.c (gtk_icon_set_get_sizes): get sizes an icon
        set can render without falling back to missing image icon
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f96569ce4f7f3006ca077231c78ab1c5dc8ca3f1..0adb6a34fe4bc0644871d95e00a7c41ca9b130e7 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,13 @@
 2001-05-25  Havoc Pennington  <hp@redhat.com>
-       
+
+       * gtk/gtkiconfactory.c: fix so that default icons are created if 
+       you call gtk_stock_list_ids()
+
+       * demos/gtk-demo/stock_browser.c (create_model): sort stock items
+       in list
+
+2001-05-25  Havoc Pennington  <hp@redhat.com>
+
        * gtk/gtkiconfactory.c (gtk_icon_set_get_sizes): get sizes an icon
        set can render without falling back to missing image icon
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f96569ce4f7f3006ca077231c78ab1c5dc8ca3f1..0adb6a34fe4bc0644871d95e00a7c41ca9b130e7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,13 @@
 2001-05-25  Havoc Pennington  <hp@redhat.com>
-       
+
+       * gtk/gtkiconfactory.c: fix so that default icons are created if 
+       you call gtk_stock_list_ids()
+
+       * demos/gtk-demo/stock_browser.c (create_model): sort stock items
+       in list
+
+2001-05-25  Havoc Pennington  <hp@redhat.com>
+
        * gtk/gtkiconfactory.c (gtk_icon_set_get_sizes): get sizes an icon
        set can render without falling back to missing image icon
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f96569ce4f7f3006ca077231c78ab1c5dc8ca3f1..0adb6a34fe4bc0644871d95e00a7c41ca9b130e7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,13 @@
 2001-05-25  Havoc Pennington  <hp@redhat.com>
-       
+
+       * gtk/gtkiconfactory.c: fix so that default icons are created if 
+       you call gtk_stock_list_ids()
+
+       * demos/gtk-demo/stock_browser.c (create_model): sort stock items
+       in list
+
+2001-05-25  Havoc Pennington  <hp@redhat.com>
+
        * gtk/gtkiconfactory.c (gtk_icon_set_get_sizes): get sizes an icon
        set can render without falling back to missing image icon
 

diff --git a/demos/gtk-demo/stock_browser.c b/demos/gtk-demo/stock_browser.c
index e48c21611235f6e3f0a855e8df786c35ed882051..33120fe6dc66de919f63bd72427eac91beac1008 100644 (file)
--- a/demos/gtk-demo/stock_browser.c
+++ b/demos/gtk-demo/stock_browser.c
@@ -1,10 +1,13 @@
 /* Stock Item/Icon Browser
  *
  * This source code for this demo doesn't demonstrate anything
- * particularly useful in applications, it just lets you scan the
- * available stock icons and stock items.
+ * particularly useful in applications. The purpose of the "demo" is
+ * just to provide a handy place to browse the available stock icons
+ * and stock items.
  */
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 static GtkWidget *window = NULL;
@@ -134,6 +137,7 @@ create_model (void)
   store = gtk_list_store_new_with_types (1, STOCK_ITEM_INFO_TYPE);
 
   ids = gtk_stock_list_ids ();
+  ids = g_slist_sort (ids, (GCompareFunc) strcmp);
   tmp_list = ids;
   while (tmp_list != NULL)
     {

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 117faeaaced0c0a95dcd02f9e363e5e2341bc56b..35ce60f20314139898813cbcfd14b3f257b3b7f3 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -273,6 +273,17 @@ gtk_icon_factory_remove_default (GtkIconFactory  *factory)
   g_object_unref (G_OBJECT (factory));
 }
 
+static void
+ensure_default_icons (void)
+{
+  if (gtk_default_icons == NULL)
+    {
+      gtk_default_icons = gtk_icon_factory_new ();
+
+      get_default_icons (gtk_default_icons);
+    }
+}
+
 /**
  * gtk_icon_factory_lookup_default:
  * @stock_id: an icon name
@@ -306,12 +317,7 @@ gtk_icon_factory_lookup_default (const gchar *stock_id)
       tmp_list = g_slist_next (tmp_list);
     }
 
-  if (gtk_default_icons == NULL)
-    {
-      gtk_default_icons = gtk_icon_factory_new ();
-
-      get_default_icons (gtk_default_icons);
-    }
+  ensure_default_icons ();
   
   return gtk_icon_factory_lookup (gtk_default_icons, stock_id);
 }
@@ -2056,6 +2062,8 @@ _gtk_icon_factory_list_ids (void)
   GSList *ids;
 
   ids = NULL;
+
+  ensure_default_icons ();
   
   tmp_list = all_icon_factories;
   while (tmp_list != NULL)

diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h
index fc8b40da66d3da0512b9cf12c8bdfa26275ce8fb..9ca91aab04eded1a1d3d5c104fc203862d876900 100644 (file)
--- a/gtk/gtkstock.h
+++ b/gtk/gtkstock.h
@@ -62,8 +62,6 @@ void          gtk_stock_item_free (GtkStockItem       *item);
 
 
 /* Stock IDs (not all are stock items; some are images only) */
-#define GTK_STOCK_MISSING_IMAGE    "gtk-missing-image"
-
 #define GTK_STOCK_DIALOG_INFO      "gtk-dialog-info"
 #define GTK_STOCK_DIALOG_WARNING   "gtk-dialog-warning"
 #define GTK_STOCK_DIALOG_ERROR     "gtk-dialog-error"
@@ -101,6 +99,7 @@ void          gtk_stock_item_free (GtkStockItem       *item);
 #define GTK_STOCK_JUSTIFY_FILL     "gtk-justify-fill"
 #define GTK_STOCK_JUSTIFY_LEFT     "gtk-justify-left"
 #define GTK_STOCK_JUSTIFY_RIGHT    "gtk-justify-right"
+#define GTK_STOCK_MISSING_IMAGE    "gtk-missing-image"
 #define GTK_STOCK_NEW              "gtk-new"
 #define GTK_STOCK_NO               "gtk-no"
 #define GTK_STOCK_OK               "gtk-ok"